projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f40f5dc) | patch
* vc.el (vc-update): Resolve conflicts if necessary instead of
authorDan Nicolaescu <dann@ics.uci.edu>
Sun, 13 Jan 2008 20:03:35 +0000 (20:03 +0000)
committerDan Nicolaescu <dann@ics.uci.edu>
Sun, 13 Jan 2008 20:03:35 +0000 (20:03 +0000)
commitc6a234ac6c8a198b2b627b72bb7d56d22b71638a
tree0ad9468f90f09bdc6dfdb21ea052253a7e9bfe11tree | snapshot
parentf40f5dc36e552879e565e489a4e3a5f19be7e4eacommit | diff
* vc.el (vc-update): Resolve conflicts if necessary instead of
just updating the buffer.

* vc-cvs.el (vc-cvs-merge-news): Ignore the error status of the
update command so that we can parse the output.
lisp/ChangeLog diff | blob | history
lisp/vc-cvs.el diff | blob | history
lisp/vc.el diff | blob | history
Unnamed repository; edit this file 'description' to name the repository.